bitkeeper revision 1.1389.16.1 (4280c9e2jOlPDS_OBC6Lw_D6kD2DsA)

smpboot.c:
  Fix apic setup for SMP guest kernel running on non-SMP machine.
  Plus minor cleanups.
smpboot_hooks.h:
  smpboot_clear_io_apic_irqs now makes sense.
smpboot.c:
  start_secondary doesn't return anything.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c
index 3e9f82f1d96fa5a8359a42ab33d0d4f6751289dd..7c1ef78cd99a00e98337e8f1db74a04a77257849 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c
@@ -54,6 +54,7 @@
 #include <asm/desc.h>
 #include <asm/arch_hooks.h>
 
+#include <mach_apic.h>
 #include <mach_wakecpu.h>
 #include <smpboot_hooks.h>
 
@@ -493,19 +494,7 @@ static void __init start_secondary(void *unused)
        local_irq_enable();
 
        wmb();
-       if (0) {
-               char *msg2 = "delay2\n";
-               int timeout;
-               for (timeout = 0; timeout < 50000; timeout++) {
-                       udelay(1000);
-                       if (timeout == 2000) {
-                               (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(msg2), msg2);
-                               timeout = 0;
-                       }
-               }
-       }
        cpu_idle();
-       return 0;
 }
 
 /*
@@ -1111,15 +1100,15 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
         * If we couldn't find an SMP configuration at boot time,
         * get out of here now!
         */
-       if (!smp_found_config /* && !acpi_lapic) */) {
+       if (!smp_found_config && !acpi_lapic) {
                printk(KERN_NOTICE "SMP motherboard not detected.\n");
                smpboot_clear_io_apic_irqs();
 #if 0
                phys_cpu_present_map = physid_mask_of_physid(0);
+#endif
                if (APIC_init_uniprocessor())
                        printk(KERN_NOTICE "Local APIC not detected."
                                           " Using dummy APIC emulation.\n");
-#endif
                map_cpu_to_logical_apicid();
                return;
        }

diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h
index 7479f82686bbcb462f856978cc9332215eaec3fd..c2c211e5ead3aa50a4f6072b9a98a9b54d67eab6 100644 (file)
--- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h
@@ -3,11 +3,7 @@
 
 static inline void smpboot_clear_io_apic_irqs(void)
 {
-#if 1
-       printk("smpboot_clear_io_apic_irqs\n");
-#else
        io_apic_irqs = 0;
-#endif
 }
 
 static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)

diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h
index 7479f82686bbcb462f856978cc9332215eaec3fd..c2c211e5ead3aa50a4f6072b9a98a9b54d67eab6 100644 (file)
--- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h
@@ -3,11 +3,7 @@
 
 static inline void smpboot_clear_io_apic_irqs(void)
 {
-#if 1
-       printk("smpboot_clear_io_apic_irqs\n");
-#else
        io_apic_irqs = 0;
-#endif
 }
 
 static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)